changed regexp further up