Update on latest code changes

Signed-off-by: Christian Ege <k4230r6@gmail.com>