added schema, amended