better conatinment handling and revert animation speed