Updated code moved to WebDriver