working on converting to new rw system