first review comments applied