move animations to a more appropriate place