One-off shape-drawing added