Now uses editable skeleton