Take over changes from skeleton cookbook (d60a811)