.active is working
refactored for cleanliness