updated schema, still needs improvement