merged with peter