start of custom changes