Changed nesting order