some changes, null outs