added back in full entropy, works well