Update start up logic
Update start up logic