#213, tweaked vars