adding hijack
Merge https://github.com/boochos/work