[DEV] better regex ==> need to update alge to recognise data