added some animation shenanigans