Now working with flattened syntax