Francisco's changes