more progress, swap in place?