removed shake / added swing