Slight modifications.