add xs regex
cleanup regex
cleanup