reordering and comments
adds colors