major interface improvements