Simplified the skeleton