Further changes to the skeleton