Added has_more instance variable