merging Miguel changes