Improve Skeleton