logic and display changes