merged with maria and dan