Make runs more dynamic