Back to ArrayList for simplicity