edit #7.1 #7.2