FINAL CODE SYNC FIX