modified schema a bit