Implementing requirements from Modifications document.