merging jmalsbury's updates