updates for issues #6