1. update and fix