modified for comments