Updated base script