Some changed to presentation