Updated VP diagram
Update Encoder.java
Revert "Update Encoder.java"

This reverts commit 3ea7802ef6a1b58927e18e9ecc70e10d1a231680.
Merge remote-tracking branch 'origin/Bartek'
HotFix for Encoder