reordered methods more comments