Correct/cleaner drawing