added commenting functionality