added new variables for extra configurability