MGR + SS - Merged the two branches