Reworking given syntax