More work on elemental system.