Made changes as per class week 4