refactoring
animation disabled