new
fixed arrows
fixed TODO