moving old hook logic into new request module