Incremental changes to skel output