Fixing
Final Version