Update w/ activity 3 and fixed activity 2