changed types to bigint