more slight modifications