Better controls