Upgrade lab 5 + code