James line
Resolved Oli/James conflict