Update application with lab4 and lab3