Changes for Nicks review!