More slight modifications