updated state regexp