Bug 9 - Adapt start up script