Re-added X* variables to maker