ENHANCEMENT - Applied ss3 changes (control/with)