Review based changes