Update code to version 1.6