merged with chris