SS - Cleaned controller
MRG + SS - Merged the two branches