working on reg ex
should be finalized