Updated with weekend work from S/E formatting