Taking latest changes from the original