Some more work on the element system