Changed hierarchy & Corrected Lists