update to james branch