update: need to fix final page