changes to api now use regex