Case 03 and 04, plus updates