saving works again, alhough buggy