First draft for issue #45