more model and data work