first changes in variable handling