change name of delegate methods and send self & popover