Major update with Skeleton