Reconfigured the skeleton