changed to direct references...still need to fix deletion