added push hijack (wip)