working set of changes without all them comments