Review-based changes