more progress on incorporating edge flips