3.16 support and removed touch screen support