Tried to cut down on Selenium calls