change to OO-model