Final Leandro Update