#9 improvements