Updated to include "missed" formatting for encore.

Testing required.