Some changes to the animation loader