Take over changes from skeleton cookbook (5f6fe83)