changes from mail part1

Signed-off-by: Philip Miglinci <p.miglinci@gmail.com>