modify code for standard