Some more modifications.