Added base-value variables back.