Animation rewrite