2(d) needs work, 2(e) should be ok