Fixed BUgs to Sync