More work on custom animation