Done with the changes stated in the feedbacks

Resolved the conflict in branches in last commit