tasks 015&016 corrected