Mode updates for version 3.18