added conditional check for website and location