add comment and add handle