Updated to reflect the changes from Marcos