Prepare for version 7
