Typo and logic
More logic