changing variable names, putting shake listener back