Changed drawing to new system