Change to `.on` format