did some renaming in the second round
added some stuff to second round