improvements to skeleton