added reroute and add helper forms