Save before output simplification
Final commit for review