Updated changes from tech proofer