Merges Pablo's Changes