Shifted code from onCreate to onStart