ELVMax fixes. Will change value numbers later