Version fix and code changes
Prototyper fix