Design Modifications #15 Issue Completed