More and more working in tablet code