Upped the whole code with and without changes to reflect the changes I did