initial set of changes, need more complete sample data