Some slight modifications.