merged with changes