Another round of re-think for the enhanced syntax. This time the