Some slight modifications