added variables and names