updated two includes to use the new variables