cleaned routing 2