initial + schema changes