minor changes to the skeleton