Rework all a lot of stuffs :)