Make Lon's file even better