Minor amendments based on Client feedback