Added entropy formulation