Made startup even more quiet and quicker