Fix abor but still not perfect
Fix conflit and merge w/ Arbor feature