[Improved] Logic
[FIX] Tabbing