minor changes SW stub