Made "final" changes to the skeleton