Added The rest of the changes that i regret :(