Changes for version 6