renamed confusing model, reduced dependency