Refactored and now run is awesome