fixed one SW case, need to work on the other one.