Make midway more portable