lines
color circle
optimisations
merged