Two page version w/ other refactorings