Merged and corrected