My changes for requirement 8