merged and cleaned