Final figueroa/Fischer

Modified