updated to latest design

Signed-off-by: Mark Kelly <mark.kelly@lexisnexis.com>