Better var handling; 0.2