Proposed issues 3 and 4 finished.