Improved startup script