Modifications to class draw and constructors