Improved version of xjump