Working through skins upgrade