animation broken, but cleaned up a little