I've added a basePath variable that is used for these 2 variables.