update to new router api