Slight tweak to the way the approuter is used