Did awesome new changes and added couple of functions