Update to version 5
Merge v5 and v6