Updated Parts in prepation for Gamma options

Signed-off-by: Daniel Tarrant <daniel.g.tarrant@gmail.com>