finished generic/shared
update to variables