Implemented Michel's suggestions