Moved some confusing delegates