improve tramp wip