New variables + fixed config