Get Mode out of where it is not needed, and put it where it is