added better drawing