fixed order updaet things. this commit is very good