Updated to simple class selectors
Updated to simple class selectors