updated delegate, removed old functions