Better nesting!
Minor color changes