Most changes completed to QUICK model