Added new stuffs to it to make it better