Commit from diogo code