bike-shedding
Better animation logic