some rennovations with the Run module