merged with james