Revert "Revert "Revert "Make Lon's file even better"""

This reverts commit 58c306b522768c74f43e123d41b47577668fb528.