finished initial data model
tweak