UPdate from EMma working branch