Add latest changes from pete