Fixed error with routing
Some changes (sabath night)