James | Small modifications