review: first part of small changes