More terminal enhancement