Changed return values to include page values