Removing ints, its all long now