Changes for startup