Slight syntax changes