added bigint  handling