more simple syntax changes