Update from joao

Update my local project