Start/Stop functionality added