MR for james

refresh for consistency