merged in other changes