Animation + User control + various other changes