#8 improvements