fixed mainv2
Merge branch 'OpCode'