2 c,d, minor changes