10/6/14 - revised entropy