General`e logic changes. Side note, I'm really tired.