Added simple update(part 1/2) and fix method