Improved 230 - frank wu