Updated base scripts