Upgraded to latest skeleton