Improving the base scripts