diff --git a/makefile b/makefile
index faa9852e4d8a60fafee41f011a0d185b7a5b9b24..bef867d76de9523757a5e76a480e19ca11153021 100644
--- a/makefile
+++ b/makefile
@@ -83,16 +83,17 @@ BOOTROM_ADDRW     ?= 8
 BOOTROM_HEX       ?= $(SOCLABS_NANOSOC_TECH_DIR)/testcodes/bootloader/$(BOOTLOADER).hex
 BOOTROM_BUILD_DIR ?= $(SOCLABS_PROJECT_DIR)/system/src/bootrom
 
-
-ACCELERATOR ?= yes
-
 # Simulator Defines
 DEFINES_VC  += $(MEM_INIT) +define+CORTEX_M0 +define+USE_TARMAC 
 
+# Is an accelerator subsystem present in the design?
+ACCELERATOR ?= yes
+
 ifeq ($(ACCELERATOR),yes)
 	DEFINES_VC += +define+ACCELERATOR_SUBSYSTEM
 endif
 
+# Is the Arm QuickStart being used?
 QUICKSTART ?= no
 
 # System Design Filelist
@@ -163,11 +164,13 @@ DEBUGTESTER  = debugtester
 # You can append additional make options for testcode here
 SW_MAKE_OPTIONS = CPU_PRODUCT=$(CPU_PRODUCT) TOOL_CHAIN=$(TOOL_CHAIN)
 
+# How many tests to Run In Parallel in a Regression
+PARALLEL_TESTS = 4
+
+# Create a Directory to Run a Regression in
 $(eval REGRESSION_NAME =$(shell date +%Y_%m_%d_%H_%M_%S))
 $(eval REGRESSION_DIR =  $(SIM_TOP_DIR)/regression_$(REGRESSION_NAME))
 
-# Create a Template for Regression simulations
-
 # Create List of Make Targets
 TEST_LIST_MTI = $(shell cat $(TEST_LIST_FILE) | while read line || [ -n "$$line" ]; do echo mti_$$line; done)
 TEST_LIST_XM  = $(shell cat $(TEST_LIST_FILE) | while read line || [ -n "$$line" ]; do echo mti_$$line; done)
@@ -330,7 +333,7 @@ regression_$(SIMULATOR): compile_$(SIMULATOR) bootrom debugtester
 	@echo --------------------------------------------
 	@echo Simulator: $(SIMULATOR)
 	@echo --------------------------------------------
-	@make -j4 all_$(SIMULATOR) REGRESSION=$(REGRESSION_DIR)
+	@make -j$(PARALLEL_TESTS) all_$(SIMULATOR) REGRESSION=$(REGRESSION_DIR)
 	@make -j1 regression_results REGRESSION=$(REGRESSION_DIR)