update main version with changes from working