updated to new skeleton