Changed as per comment for seventh exercise