Changes in 'On' syntax + specs