Updated how variable re-definitions work