Copy from sw-status with modifications