Changed all long long types to long