before major changes
added SW 2 and 3