Incorprationg James changes