More logic update 🧠 (Warning:very long)