Fix efficiency saving and volume output