Made changes to reflect solution