adding bigint (commented out by default - too slow)