Adjusted motifs 7 and 8