removed the completion handlers, for now