exer 2.40 - seemed easy.
should have commited this change previously
pretty simple - but not happy with the code - will clean now
a little better.