Bring up to date with Roland's code again.