Reviewed lines 900 - 1000