Model Review and Retrofit