Changing to Skeleton-based design