change to support piops and raid