Updated with skeleton for MacSoup.