refined regex and added annotation