Update from old version 1.6