Updated setup variables and functions