minor editings to speed up process