more and more like our schema