done, changed to return boolean and dropped the callback