Updated from global requirements