Adding some stuffs