some custom changes