Standard changes

Standard changes