10/9/14 - updated entropy code