tweak the schema stuff to match what Kim did