add DrawObject
rafactor code