improvements on polices and routes