commens added, obsolete use removed