Changed logic for updating display