Changes for Chevron release