Revert "Revert "Modified Encoders""

This reverts commit 8d997122c8d2f0779d085030a18de52e0a543004.