1. -Polish and fix