Better start up behavior