Final commit

Made all necessary changes