Finished contact overhaul