taking changes from 1.2 to stop service