adding haakons code
h44k13 added new code