L2 Problem 2
merged changes