changing to new approuter interfaces