implement comments of second review cycle