changed variable handling.