updates to parts 1 & 2