Added and altered few other changes