Improved nesting, following manual testing
Simplify