improved patterns et al.