Made auto add and organize more stable