Refactored long to ints phew!