Made changes as per comment