Add pressure queue, fix merge conflicts