update for raw deref and box changes