(latest changes coloured)