Improves design, adds active state