Redo paper structure w/ Serge's feedback