Reviewed line 700 - 826