some refs, new code