move more code to onCreate