some work on sw class