added variables to address new feature in master