udpate skeleton to the new system