Updated with all the changes I made for the submission to Blue Marble