Upgraded Lab3 and Lab4