Corrected 5.10.19
1508 & 1580 corrected Q pts