Final? fix for skin and model changes.