minor changes, modified model structure and added new model