Updated harnesses to be a bit nicer