Updates for LW #15

Signed-off-by: Dries Vints <dries.vints@gmail.com>