changes to make animation suck a *bit* less