performance and interface improvement