Update: new entropy calculation method