Changes to laymode