Changed from integer to long