reverted last change
refactored drawing pipeline