Updated variables to be more generic.