enhancing #23 request