removed some of the schema, schema not the same any more