Build with new touch improvements