work on router redirect logic