Initial Version
Misc changes after synthesis