Lots of code and stuffs added