Switched to a KV system to make changing modes easier