Made animation more efficient