completed 2.0 with iTerm support