Prepare for re-worked animation