2nd commit with better skeleton