More logic and simplicity