moved the models out and added more model choices