Finished with first round of modifications

Top