Revised organization and completed elements