Part-way through optimizing the decoder