Improvement to Bin Router!