merged rounds and fixed errors