Merged better startup routine