Changed schematic and .cmp for issues 12 & 16-20