Working on rewriting some stuffs :)