Check Point 4

@jpoy88

Please review the changes.