more model and controller shanges