changed variable handling