modifications with comments