Changed returns to long