improvised regex
added data context