Added more animation, trying to fix critical bug