change logic, new schema pic