Tried to improve nesting. attached interdiff for same