Revise debugnan changes -- include compassign