updates from abis comments