Reworking syntax