Addressed changes Sam asked for