Changes for implementation according to the comments of the implementation reviewer #237