Little more work on elf