Work on tablet

merge