removed animation in some places