Merge Joao's work