Changed int to long