fix and updating