comments part fixed and tested