Ben changes
Fixed overflow issue