Added animations, fixed random selection