Updating with @mateu-aguilo-bosch changes