removed some refs, added some refs