more CRUD changes