Moved more animation work to the thread