Added code to start stop features