added classes, add paint circuit