And yet more animation logic