OPS-2760 - modifications

Signed-off-by: Kyle Rockman <kyle.rockman@mac.com>