Now works along with display