final commit from Lee for animation