working on schema changes