Add more checks and try to be mobile-friendly