Improved nesting of selectors. Please verify