Zen mode improvements