added variables, dictionary, & conditional