Shorter animation duration
Fix merge conflict
Remove function