Updated with latest skin changes