I would have to say both past and present,The old nightwish stuff was amazing and will go down as one of my all time favorite bands ever,But tarja solo is also amazing and much more her personality and emotion is able to shine through now then before,so i see what you mean about her being happier,and thats most important for tarja

.So ill be her fan with or without or whatever direction she takes she will never walk alone
