Slight modifications here and there.