Improve singular sw