Replaced delegate callback with block.  Removed redundant flag from model.