added commenting capability