MADE ANIMATION WORK!!!! YAY!!!
fixed merge conflict?