Updated animation logic
Updated components to new logic