Updated parts 1 and 2