add to parts 1 and 2