Two listen path to be used

@Olu please help here