resfactored the runner