Addressing first round of review on implementation.