added commenting capabilities