Updated according to comments

Updated according to previous comments