Improved SWE chap