Updated basic drawing