failing to fix entropy
merge