fixed data model, removed branches