Merged everything