added commenting logic