improved 9.3.4