Updates to Setup and Start script