Fixed logic and display