#79 Optimize routes