Merged Eduardos changes