Draw the correct values
Some refactorings of history