Regular Expression modified