Initial commit with fixes
Merged changes in Controller