Improved theta saving