[Issue #2] Yet another reorder of variables to load in correct order.