modifying for ease of selector use