Updated to use Skeleton.