Final Commit on Encoder