Remco's suggested changes