Introduced runs and removed things we don't need anymore