Merging James' comments