Updated for efficiency. Removed Speedtest