Advanced additions to the current controls