Added all changes I did so far