slight modifications and shortening of things