updated schema for real this time