Updated based on Luis' feedback