Changed order logic link with main shell