more refactor for queueless boshing