Better mode handling…