I agree with this fully.
Also arena stakes need to be addressed.