Update for version 1.6