incorporates Zuhayr's suggestion