merged powerups from testing