Part 1 added options