Merge ideas 7 and 8