reorganized other model code