Check in for More modification

*Fix the Freeze bug by removing animations