Updated to final version for homework 11