s/long/int/ to be consistent throughout.