Second round of code review implementations