Update on regex code