Updated for requirement R003