Merge branch 'ismaelJimenez-update_complexity'