Removed Outline and Added Structure