Modularised, Added Checkboxes output catch