C.3 - C.4 finished (still some problems)