modify after mail to Joel