Last changes before Tasmania
done