Started on Encoder patching