Another attempt at displayable bug, some refactoring.