changed yaml stuff to keys