Ported some comments