changed long to big integer