merged changes from hank

merged changes from hank