transferred most of the old model to uml