Updated ext with merge