changes from rob fig