Added logic and display, functional