TEMP fix, modes need to be redone