Bring Francisco's Changes to my branch