manually merged updates from ed