Last commit, some variable adjustments