Improve animation