Interface improvements, 2