added variable handling