Merge Nadir's stuff