merge back our slight modifications