add right?
merge and fix