Almost finish code_TP3