Fixing problems revealed in review
Fixing problems revealed in 2nd review