Some subtle changes before presentation