slight modifications to match vendor cleanup