Update (some of the suggestions were applied)