master - more changes in vars