Fix & Shine

Fix & Shine