Reconsider the delegate system