Added more robust start-up