Animation all done, still need to be optimized