Simplify computing according to new model