updated sw values
solved merge conflicts