Changed animation logic