Finished 059 revised optimistic locking

#275