Fixed CS
Corrected bug with routing