Change order from commands to initialize all correctly