Adding proper kill switch to app