Updated the skeleton a bit more.