final bits before merge