Fix: Final desirable code