update regex
better method naming