ELF-20 final touches