event renamed to eventObj
missing Circle and Line Class added.