changed schema slightly