almost done, removed str
merge