touchup part 1
touchup parts 2 and 3