added commenting systempartially