slight syntax changes