Changes after feedback from RM.