Added more arena logic