Merged version 7