new variables and fixes