added world swap and timer bar to master version with collision