updated more pages, changed response ordering