Some improvements
Nesting