big change
fixing warning
enabling tablet