New schema, still making changes to the logic