merging for tidyup, got confusing