Added changes taken from git log