Added onStart() and onStop() functionality