Take over changes from skeleton cookbook (aa49f10)