edited 2.b and 2.c