Updated regex more