Updated delegate methods