more slight modifictaions