Now have proper regex