Control improvements