merged with cody