LPS-35593

Hey Mccann,

I didn't end up changing too much. I kept the updatePage method. Also, I made small changes to cad2f23