enhancement #8 added