added onResume
commented out testing
merged with master