Implemented updates from the review